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

Change-Id: I2f71df8dbc32309901f29ce633519706cbd9c728