[automerger skipped] Added device-based geo-fencing debug info support am: 52f007eb2e am: ccdc20224b am: 425660566b -s ours
am skip reason: Change-Id Ifacf6d18a3ca24f589eaf5c08359c2415eeda54d with SHA-1 2832546df7 is in history

Change-Id: I5c402d93b3ad4b6d359d4000475d551d115716ca