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

Change-Id: I3e6f129d6e394884591c7a26b7f9c98e32df1c00