DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 811136fca5

Change-Id: I4883975987ba82899383da2ee636fb3eeca6b41d