[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: da5dd7a6e1 -s ours am skip reason: subject contains skip directive Change-Id: I003e63fe3721717c38f99551c443e5c1f4dcb3e4