Merge "Clarified FillCallback and SaveCallback behaviors." into pi-dev
am: 971ad7aa5e

Change-Id: I3dda44262a318c277aa226321b0ed1e1dc34e6a1