Merge "Add battery estimate to content description." into qt-dev
am: 0fbcf57edf

Change-Id: I71f495f74139645325102bdb3e1fe94e7012c17a