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

Change-Id: If5623acae1efbd4b0db4bcd3989762a194fe4361