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

Change-Id: I09c87c637ed57202d4ba1e3cdaa532b0b126d74b