am b2a6c7b8: am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev

* commit 'b2a6c7b83f894922663e7144048264af96239a1e':
  Round charging indication to nearest minute