Merge "Added device-based geo-fencing debug info support"