Happy checkstyle

Change-Id: I5b7586a2d5ff8a5f91004fe47e150724a8175812
15 files changed