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

Change-Id: I97afbdc9a037c10906a243d6b64cd6cffa060351