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

am skip reason: subject contains skip directive

Change-Id: I5201a5a420e629ec88f80b009eb5416b08767e93