[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 4bdb6b4692 -s ours am: 259a66ed42

Change-Id: I9cc5edfa7d0fbbd54fc29b3d7a0f8ab7f101f2ad