Merge "Fix warning from error prone."