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

Change-Id: Ia8e5765654c73b23298662b5186b2df9e2e12f6f