Code style fixes and APIException import fix

Change-Id: I23a46292150b59bd2df1374f2124398c724ca34c
Merge "Code style fixes and APIException import fix"