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

Change-Id: Id52315c068edacb13ddbe03a7d14158889a6314c