Merge "Turn off the verbose logging in the AppBatteryTracker" into tm-dev