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

Change-Id: I089479aa26bb766825d1251ebc0df59cc171fdb4