DO NOT MERGE - Minor fix on internal method name. am: 15b44fe1e3
am: 563b30d6fe

Change-Id: I369fbf1f00ae1e59f499a43e85df3601eb668b61