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

am skip reason: subject contains skip directive

Change-Id: I76bbf7091eee0c53425fdfda0fe01dd26d21d8f0