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

Change-Id: Id29971e327ef5e9b16d3a5b17417a933270ea634