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

am skip reason: subject contains skip directive

Change-Id: Ia89c79dbfe68eeff579da05466cda478c19ad0c6