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

Change-Id: Iba71b4d50cf2b215cb32879f7876afe5363222dc