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

Change-Id: I36bbaad4d7683fd8a9dd1b68809e8cc907e1a242