Merge "Add sanity check method for BatteryTip"