[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 646ccf753d -s ours am: 10597d6566

Change-Id: I9b3f3409f8f39c1ed531a0928410cb79c23a4bb2