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

am skip reason: subject contains skip directive

Change-Id: I84e33cc6d9030017202754fe1a48c68a1ba1f4b0