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

Change-Id: If4e073530481ee787a8489150c445f28d615da35