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

am skip reason: subject contains skip directive

Change-Id: I3b297f040536e0ffd7ddbf9f9c845d2057abd17b