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

Change-Id: I880d7317d1d1224f2c4c6631a173a0ad34eac7db