Merge "Change battery icon to the side of bt icon" into oc-mr1-dev am: a57aea0d61
am: d5d9766793

Change-Id: I8dbc10eff33b8eeee0b5942a53080c7d504ec7d9