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

Change-Id: I4c1ccf2781df42d24e24542c545ac1f104abe1ed