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

Change-Id: I807ad5588769fbc12d0ba258acd8988794d56d0d