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

Change-Id: I98cdcf5e6922201ca7a67da835b6ecc5a7b69b77