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

am skip reason: subject contains skip directive

Change-Id: Iebdb7aaa328523204ee4a96022d0ea3b72253b54