[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 43d414a499 -s ours am: 1b19c6140c am: d3e73504b2

Change-Id: I169c1fd8bf244df78457bf8f3f497f6e9fb77b1c