Merge commit '7c03be07244c4735661a5459729a417427439c4d' into ks-aosp.lnx.12.0.r1-rel

Change-Id: I3dae631547baed9939f76586a64836041628d9a2