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

Change-Id: I1aaea8710cc2f46602d1543c6c7f304eb79a112c