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

Change-Id: I7ec567e064b0a836816c16d5c5573c28ca5e3c4d