[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 6817660310 -s ours am: 6ef3ef14bb am: 1f326ff35b

Change-Id: Ifafed444ca9a5553d0cd02cb062395ab594f1384