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