Merge "Fix battery content description when there is no percent mode" into qt-dev am: 4f3e0aa4d3
am: fe75e37ce7

Change-Id: I25bbea9be57b7f72cce3d026f268c7d63ad7a616