Merge "Fix 5369428: Use full battery state information when determining charge status" into ics-mr1