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

Change-Id: I1411aee162211f2101b6a90d200af0f380df6a0c