Fixed CHECKSTYLE warnings

Change-Id: Id933eca8f61774fe2a0c9e61cafb3a3172031377