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

Change-Id: Ibdee3ee359415f684b1e30223f89b7a2dfb0ca4b