Fixed CHECKSTYLE warnings

Change-Id: I60cc26c5cf980469065b9727b2a42461f4534114