Merge "Prevent repeated battery history in checkin dump"