Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev