Merge "StubObject: Use 'self' instead of 'StubObject' (or <ClassName>)"