Merge "ColorSpace.java,cosmetics: fix some typos"