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

Change-Id: I74ed90653c8c718026d4370b5bdccd0c2db0ebfc