Merge "Change Browser location pre-grant to fg-only" into rvc-dev am: 99c0b6d1 am: 51e89643 am: 6cd8bffa Change-Id: Ia2464fe868b3b6b5e9e84ad11fafd598562d1dcb