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

Change-Id: Ia9820692a4f1caec2f78e7077e7c0b989d579003