Merge commit '4e97665bd56dc0908acf3ef1681dc5cff226f795' into ks-aosp.lnx.12.0.r1-rel