[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 962bc9d662 -s ours am: a37ff821d8 am: 8f23e79b2a

Change-Id: Ib0b6476013d7555cd3bd20faca55ecd3c19e2c99