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