[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: cb16c1f6cc -s ours am: 244a6e4f9e am: cdb84060ef

Change-Id: I72f675c500857895661d48c95e0b422ff304a40f