[automerger skipped] Merge changes from topic "update_battery_icon" into qt-qpr1-dev am: c08f70b7
am: edb8dd61 -s ours
am skip reason: change_id Ifa9a31750b9a926e09aec9262aa89e8de66c91e2 with SHA1 3dd4f2cc is in history
Change-Id: I8ef3f7e7084e88f5a853422c004ac702e15136d7