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

Change-Id: Ib9e5443c99062a5c4b8997816759a6c11ed6010d