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

am skip reason: subject contains skip directive

Change-Id: I6305d2fd3321dc4bb48ba8f76c6a48da9031c54a