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

Change-Id: I80dc833d1a9394dc61a09296a9dbad604c3c0a0d