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

* commit '579338345721351313d4c3cd2a5114a0d135028d':
  Fix Tests after cherry picks. [DO NOT MERGE]