Merge commit '762e80638611d2818aaf101211c3292026f45c6f' into ks-aosp.lnx.12.0.r1-rel