Merge "Update comment for BATTERY_TIP_CONSTANTS"