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

Change-Id: Ie83321d10d493c62a1d8f6a6321c9500b1dbe0b7