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

am skip reason: subject contains skip directive

Change-Id: I22282cf2941896db23733ef5c017f94362b7d681