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

Change-Id: I624db741dc341e52db7cc1802685f8a7d4078405