am ec5a1d1b: am 98d1af1d: Merge "Passive test of consistency of mode and provider apis" into klp-dev

* commit 'ec5a1d1b9c8bd27e7359672c45c40b268d08f345':
  Passive test of consistency of mode and provider apis