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

am skip reason: subject contains skip directive

Change-Id: I96973d5bdaf15d8ac5fba5272f10c61cc98f0914