[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: f29082767a -s ours am: 2886375e6a am: fb0fee7bad

Change-Id: Ib77e6b0da515ad23247fe1a0628459d1e6932098