[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 21a32322 -s ours am: 12d9c3e5 Change-Id: I13a3628db8a631acbf9deb7039dab043fb99a599
mentioned in commit ed674e5e