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

Change-Id: I07a8d4ce4fefa0c47dc6712b298356353827ea92