Merge "Bug 508166: Fixed bad method call"