Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev