am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev

* commit '8bf5f3075e6e0797e96a861330b7ff82eee88bee':
  Fix battery detail issues with "Android OS"