am 3ca2f5ef: Merge "mako: reduce the power consumption in off-mode charging" into jb-mr1.1-dev

* commit '3ca2f5ef536310f3053d87be03d4d6d7c653d493':
  mako: reduce the power consumption in off-mode charging