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

Change-Id: I743c4d4ad85f58c3c80c36be659975b679f4bc69