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

Change-Id: I4f2b0133621556b7f372871d86ad0732f6512d1f