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

Change-Id: I621f11776f498858c62e76977df163f0aef18471