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

Change-Id: I9d9c408f8d7b3ddb225d333738a4217b6ed8ec1b