[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d6712d6b84 -s ours am: 53b34c3e78

Change-Id: I3331b66aeeef28d2ba5f839f756be2d97b601f26