Merge 99417 from klp-modular-dev-plus-aosp into lmp-preview-dev

Merge 99417194b394702484d8250736e95f524fd51fe2 into lmp-preview-dev