[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 9a54b299c6 -s ours am: a25d8b0667 am: 85ab742c72

Change-Id: I251947d29a42a79dcb91761c73756ce623292cf1