Merge "Make the module existence check nonfatal" into klp-modular-dev