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

Change-Id: Ie7d97c927848deea326c4005d5359fed9d41e426