[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 6cc7c334c3 -s ours am: 660f9ffc45 am: 72a2f9a48e

Change-Id: I957d899c28ba77f8b8c999ef316e9852b0b47d5f