am 6eb987ac: Merge change 6246 into donut

Merge commit '6eb987aca79db80f8ac4c28ed1cdc5841df8cfd2'

* commit '6eb987aca79db80f8ac4c28ed1cdc5841df8cfd2':
  Fix bugs 1317754 - "Idle screen displays "Charging (100%)" even when fully charged."