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

am skip reason: subject contains skip directive

Change-Id: Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b