am a0b882c9: (-s ours) am 6351c202: am 3a863401: am 81f03898: am ba526a28: am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev

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