Follow API changes.

Change-Id: I984633a080d84bbea756341d029d0aed47882da8
5 files changed