[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 01d61ece0f -s ours am: 5766893ca0 am: d495b78203

Change-Id: Ib88ab6f49ebe75cfe07757a9e5174574f40a94f0