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

am skip reason: subject contains skip directive

Change-Id: I6d44eff89315b9fb0a032d9127c57e400f730305