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

am skip reason: subject contains skip directive

Change-Id: I290d68cd15b5eee55a83e5a0d2c102fee63a26d2