[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: fbb37525 -s ours am: f8194e47 Change-Id: I3ea375a1f6d79bbc103faf406cd90e1020185607
mentioned in commit c73324de
mentioned in commit 2df717e3