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

Change-Id: Ifc7f91c375bb2759587f3446f3140edaa6677580