[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 3c7ec382e1 -s ours am: 6a9f46646a am: 04c2cbf6a4

Change-Id: Ie93c9ebd01e7da02a71e7e6c5765089219a31812