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

am skip reason: subject contains skip directive

Change-Id: I8c8dadb9f76f4b12de9303357c6e27075cf095ce