Merge "Update expectations for 089-many-methods"
am: bd2c229146

Change-Id: I3a97d8e316025b173b93f5dc6f2c8395a0d9b237