Merge "Fill in javadocs for translation feature." into sc-dev