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

Change-Id: I62c55700021de37f9c1f815eb0863cd01b2d2bb4