Merge "Remove location_permissions_upgrade_to_q_mode"