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

am skip reason: subject contains skip directive

Change-Id: I7eb4fd43fda7206a4342794a02fbbc5fcc28c00c