Merge "Avoid static import IntDef value to workaround for Java 8 javac issue" into sc-dev