[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 1ce477c956 -s ours am: 4cf10c4968

Change-Id: I6ce697a7f72e848a1c565236339e4e9561643ba8