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

am skip reason: subject contains skip directive

Change-Id: I5cae9388f8896909cd042a65cf368034da4b52fc