Fix a few checkstyle issues

Change-Id: Id9c2de22b951d89809cbc29a5697e9615f642628
3 files changed