Merge "Removed plans that block cts tests in klp-module. Also refer to ag/437045." into klp-modular-dev