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

am skip reason: subject contains skip directive

Change-Id: I61817b5a9cb77f1c80a81c3d5cd59215ced70b5d