Merge "[RESTRICT AUTOMERGE] Send callbacks earlier" am: af5e2e16c8

Change-Id: Ie46a8469941059965fd847723c8c30f8f95b22a2