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

Change-Id: I2eb4aa81f9a185fe7c8f6c5b8fa09e7965d080ed