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

Change-Id: I3125a609b5e54c9b2a39a5ea63f11b00af79545a