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

Change-Id: I930aaeaec76f0fa8ffe01bd7ca7bbad0cca977f8