Reviewed-by: chegar, mchung
Reviewed-by: alanb, jcbeyler
Refactor MethodHandlesTest Reviewed-by: psandoz