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

Change-Id: I7a905c17f556494fe38baced770e4229b7851dc7