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

am skip reason: subject contains skip directive

Change-Id: Idb3221d23b289bc23d02b1fe5c824816b9c79b38