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

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