[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d3ca045d6d -s ours am: b9e70d0cc3

Change-Id: I62b245c7a290b85f9e521721e02cc288734322c4