Revert^2 "Unifying various model update callbacks into one"

72f9943f642dd9f57ff9d25deb12dc84cf3e7bc9

Change-Id: I38901714947a2b7926723ea25df4a2b8216303e4
19 files changed