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

Change-Id: Ife8cda3dfaf9e1cb6fb92ac18a765ee32eec0f71