Merge "Fix overlapping things in battery indicator" into nyc-dev am: f20ce47
am: 292b083

* commit '292b083bcdda05b0acab93b4eb1d264cc1d076ec':
  Fix overlapping things in battery indicator

Change-Id: I0455783eecfe1f7194e4e8084c635226a172601d