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

am skip reason: subject contains skip directive

Change-Id: Ib56607f6f12d1fbcb867e8834b115061fafb6d79