[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 90f2bb1928 -s ours am: 5eec9aa4b0

Change-Id: I3fb007c15334a632094acfc351e2cfb4c0a0d99f