Merge "Fix some warnings due to javadoc or switch case"