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

Change-Id: Ibef9642bdb5a98ae49a4322f83f0c7a1803ba01e