[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 86c71c95a9 -s ours am: 7bd412b098 am: b7d9a7d705

Change-Id: Ic5ce2b5e35403d5d9e4890735298b5418c96623d