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

Change-Id: Idd05a347009a81f6a0cb2c2445733cacbee4b2e4