Merge "Fix javadoc typos in Color and Context"