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

Change-Id: I928fee513ee054fb5a309ed241ad6fa51277a74d