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

am skip reason: subject contains skip directive

Change-Id: I8194d4e75d7423e6afbfda3974a9d8d9a610a534