[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 2953322d0d -s ours am: a920dd9ffa

Change-Id: I6c334c02d0c4137a2c8e09216c9d1270d112a038