Manually merge 910cfd51 from klp-modular-dev to klp-modular-dev-plus-aosp
mentioned in commit 5d72593a
mentioned in commit c106b844