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

am skip reason: subject contains skip directive

Change-Id: I541d9a00deccade98275be0d1685fb22bb2ec4c8