Merge "Do not remove location permissions on Q-beta OTAs"