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

Change-Id: Ia8e8ec444733b9f64d4248444a0025f5d074b3e3