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

Change-Id: If0c82ea9f5dc2d5d814c28d674323d719be8d337