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

Change-Id: I7d010ca1aee2324d595d840e0aa13fc8c99d0d87