[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 1ce477c956 -s ours am: 4cf10c4968 am: ae6316061f

Change-Id: I7e1b638343f9e74ebee0fa5a9c6f3a10edf48d36