Merge "Clean up references to @ColorLong"