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

Change-Id: I1dd32cdade2e8d5cf75a38ef8e8372c8664c8e14