[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 207dbf14d4 -s ours am: 7d020d893b am: 0a4770f774

Change-Id: I3960e132aaa65a2e00c21cfe046797563a0f42a2