[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 194d5579b6 -s ours am: e22f9fe5d2 am: fdc76c2ca7

Change-Id: I274be20f7878f539fd7f1ce0110be0476e917ac2