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