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

Change-Id: I55ab65fb755520ca7d002a8935a983e97fc0e257