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

Change-Id: I92642b591cf0b30628553a63e06c6a18231c528d