Fix the calls to be compatible with the new interface introduced in a previous commit#77368af8. Change-Id: I6944c189d2d53978250df9dee460a2ba9b8ccc83