Merge "Don't trigger new partition on fields from SaveInfo" into oc-dev am: ab8238e233
am: 50e9fecdaa

Change-Id: I1438a1932191bd144fea064769c2869bc5b29fab