Fixes for API breakage.

Change-Id: Icbd043bf4dec27c4237a07bbbadd4dfbf790a6ee
2 files changed