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

am skip reason: subject contains skip directive

Change-Id: I83e3d0a41e77c034a1c6c23c0b07542cf748bfbb