Merge "Make new onFill/onSave methods abstract." into oc-dev am: 3411adc4b3
am: 2509121907

Change-Id: I0de894537e3cdd3a9ce07f33894c7a0c3b2f6343