am 99417194: Merge 910cfd from klp-modular-dev to klp-modular-dev-plus-aosp

* commit '99417194b394702484d8250736e95f524fd51fe2':