I'm in your API classes updating your formatting

Change-Id: I6087573dfdc6edcd63062508056ebcf3502e03f2
Merge "I'm in your API classes updating your formatting"