Merge "Fix IMPL_STUB_IMPL methods."
am: c0806a863e

Change-Id: I99641dee96cea3ee6dfa23cf577e330eb64e565a