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

Change-Id: I1c7ae5be9085f785cc7bd73135623cc4f5d7a243