Merge "Update test for method name and result name."
am: e8d4931930

Change-Id: I61011d8caae8aafddff018338746b08c8012f543