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

Change-Id: I06c7429ce9a39c84405058b1c23b7ac70e455263