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

am skip reason: subject contains skip directive

Change-Id: Ib472c6dc96c18df06f283a13e637d3c19d67f5fa