am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO...
am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit 'd00d2ff2':
Fix Tests after cherry picks. [DO NOT MERGE]