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

am skip reason: subject contains skip directive

Change-Id: I915d826f7fe1da8903cc4a5493bee604bddd0fae