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

am skip reason: subject contains skip directive

Change-Id: I17094b5c27028f0dd7df918107fd5a05cd6c0ab1