am d971fd4b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd971fd4b18fc9958b72372da046d5c87473c2e3b':
  mako: reduce the power consumption in off-mode charging
  mako: allow device to sleep in off-mode charging