Merge "Remove last learned battery capacity from battery checkin dump" into sc-dev