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

am skip reason: subject contains skip directive

Change-Id: Ifa8fdaa323d0d58b496e4e68ccddf9207a72a378