Merge "Android OS battery usage overstated by screen on time" into ics-mr1