Merge "Add suppressLintAnnotation on state.java"