API updates from CM.

Change-Id: Ib027e7a9048aebfa07a2037aeda7c4caa5ef695f