[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 015387e8c8
am: 9d36f1c2e7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibeecbd70771de333d069fd03d2b1c63c97cb26e4