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

Change-Id: Ib3e6de8f42833f22bc50c949a0a346853485b130