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

Change-Id: Ib91e9a268e2c667511e92da7dac158282004891d