[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 8c0dca2b8c -s ours am: 8fc781e931 am: 379a15b146

Change-Id: Ic606d13e8f72f0d045bb3d82d48cd81002fac2c3