[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 66d97fce61 -s ours am: c4d7c4bdab

Change-Id: Ifd039a5ca7881a0f58d6e56b0f0389d3487b0fbf