Merge "Use a.t.mock.stubs instead of a.t.mock.sdk"
am: 87c6fcf126

Change-Id: Iaf8222d9bde062ebd6a75a610961b518a2fd65ca