Committing approved version of API

Change-Id: I8bc2833549878c1a44fc6dc56c1f65e1dbd7d545