[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: b2259a4531 -s ours am: 8a0f82effd am: 1aabee9692

Change-Id: I25afc9abb39c96347486920cec9f66a4317931e6