Merge "Minor fixes on SaveInfo javadoc." into oc-mr1-dev