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

am skip reason: subject contains skip directive

Change-Id: I4491f207503e8d7102354af75efa677c7cfd6722