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

Change-Id: I08a06b3f22b058c7a81158eb94ad667618c0f944