Api fixes

Change-Id: If4625e4c96bf5caf4719818a7fbc80001e65d768
2 files changed