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

Change-Id: I1972615c5667fc0918b44853efbff7230d97c921