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

Change-Id: I1dae1a19cc83f2379a31312b0c1b77aa292d3fab