Update formatting, return of the API classes

Change-Id: I8c3a5b4396a1c3bba22f676137f640c6aa3c8960
Merge "Update formatting, return of the API classes"