DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 58d082ff97

Change-Id: I9a12d7149649cba0ebcef159dd8c7bf938cbd2e3