[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 7dee80aacf -s ours am: dc71887f83 am: 3f3fd5269e am: 6e3ac1c7a7 -s ours am: e6aa7889b9

Change-Id: I192322d2961b4e9bd26f6133f1d8ae58046c1fc6