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

am skip reason: subject contains skip directive

Change-Id: I765eb160159f7d1922d8c049045f573942e4397d