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

am skip reason: subject contains skip directive

Change-Id: I64bd58133c17a223da4581e54cb82a8efdfc9808