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

Change-Id: Ief0b25e02f50d04731ff9cb3fb1ad0c414bd88fc