Merge "Removed deprecated SaveInfo methods." into oc-dev am: fc533da920
am: 184347912d

Change-Id: Ib49f2d736db07ab73d8d5ff2ca6efa7dc08fa3e2