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

am skip reason: subject contains skip directive

Change-Id: Idd22b41577c999162bae8a349a7dd3451d85cff2