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

Change-Id: If664688ab640ca83a25dbcddb8846961d904b916