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

Change-Id: Ifb704b2ce246cad9174e4d93bcb141cee7b87375