Merge commit '300f9a3ad8c6e0b8191edd67d1f40cdd00dbb70d' into ks-aosp.lnx.12.0.r1-rel