Merge commit '987264f4153376c41797d3fb61c3fe9a3ba6fc9e' into ks-aosp.lnx.12.0.r1-rel

Change-Id: Id8438386543c9ceda7cd674f498a5c481c3eacfb