[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 7f296fb742 am: 2f56a5cccb -s ours am skip reason: subject contains skip directive Change-Id: Ia547d11768af8e2377bbe8f4f4c72f9b04d0a820