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

Change-Id: I8b0df5e7e6fcfeb1132ada9fca6c6963dfb23f15