More API updates.

Change-Id: I754dc645ac08fa25019eed8fd8b7b3c47f178ff2
6 files changed