Merge "Add StubMethodAdapterTest" into nyc-dev