am 5d72593a: Merge 99417 from klp-modular-dev-plus-aosp into lmp-preview-dev

* commit '5d72593a2c8f61382671fb7a3861f04edbda84e4':