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

am skip reason: subject contains skip directive

Change-Id: I01966a335fafb8271044adb5fbf830974d65f25c