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

Change-Id: I8bd86aa45ba282ab07706780daeb6d64165746af