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

am skip reason: subject contains skip directive

Change-Id: I768d83c1831d91af26843f4c9a6429f1d915c8c9