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

am skip reason: subject contains skip directive

Change-Id: I0c3c0bd49d13215d5922c3545075f6e44f1e68cf