Merge 910cfd from klp-modular-dev to klp-modular-dev-plus-aosp

Manually merge 910cfd519908eef792e4bb375135aa1599258949 from
klp-modular-dev to klp-modular-dev-plus-aosp