Merge "Replace MOCK_METHODN with MOCK_METHOD macro." am: 3902531b86 am: 0c7c492e60
am: 568b10ea04

Change-Id: Ibac374a5c18a7fd965739bf347563f19ca533b44