Passive test of consistency of mode and provider apis

- Add work-arounds for b/11446702

- Part of b/10081427

Change-Id: I8542959073719ddb40d297141f414754276068d3
4 files changed