DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 3b55d19823

Change-Id: Ibd7c3e43e535ab991fceac961ae669ab497c3c0a