Fixed CHECKSTYLE warnings

Change-Id: Id3b488e98c42eb3d63df922d2169d15e975d8f6c