Merge "Avoid master queries in getAutoDeleteReason()"