Merge commit '6117f90097fb91cf6e7ad2d1a485313694547d40' into ks-aosp.lnx.12.0.r1-rel