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

Change-Id: If5d133787286ada33d571e7be750954f7eeaefd8