Merge "Change Browser location pre-grant to fg-only" into rvc-dev am: 99c0b6d118 am: 51e8964356

Change-Id: If9edf182911fae2bac2c9801becc32cb8509f143