Merge "Add missing ManyMethods dependency"
am: 88a6296e13

Change-Id: If9fe190d31f51b322b52504d25da27d4c85de9ae