Merge "Fix checkstyle warnings for impl/device package"