[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 5536a1ad7f -s ours am: e11e65c0d6 am: 0f4680ce63

Change-Id: I8f578834148deab370ebb6f477892f78a62e4c70