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

Change-Id: I072a5f932a0b11f8ad3d9e4528d7a1b42042c599