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

Change-Id: I4ed4ee8df3dcf2342cb1343402eab4d0b06fc411