Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" am: 3ec87ee3a7 am: 7a50ea50ce
am: a05e7a0f70  -s ours

Change-Id: I52f0b82c218700476a37945ed67efccfdfe3c497