Rename method in master to be consistent with h to fix build breakage
am: 315f713dd3

Change-Id: Ibc40ba6d893bdc99a23fd0fa37c0b867871b1c16