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

am skip reason: subject contains skip directive

Change-Id: I40063364301183ea7f0a5a430490481f195b3d76