Merge "[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 6f48900f am: 1971a3e6 -s ours am skip reason: subject contains skip directive"