Yet more formatting updates for yet more API classes

Change-Id: Iaa1cfaaffc7c55bb7670dfbff3f063cf22434f09