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

Change-Id: I370bf1d309deed8c3810972fcaa09620052382cf