[automerger skipped] Merge "[RESTRICT AUTOMERGE] Send callbacks earlier" am: af5e2e16c8 am: 6ccec394c8 -s ours am: 11e6017720 am: c60c7e0f54

Change-Id: I6986a845d659e282791f412282da0a48b21c6c4c