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

am skip reason: subject contains skip directive

Change-Id: I7b9784c6325cee3091271ab1bfeb598827efe2dc