Merge "Update battery content description." into qt-dev
am: 5c9415dd1a

Change-Id: I86e959d21fef23ab883dbc175c677c80dccfaab1