[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 530a08c526 -s ours am: 5de870be1d

Change-Id: Id114aa61ab305ad1969814630af2868bf9a91cff