[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 38470093f3 -s ours am: a9da52ba83 am: 06c297ea1e am: 5e55be0eef -s ours

am skip reason: subject contains skip directive

Change-Id: If8482e2fa600a11c597e707d8fc2c89f55e24816