[automerger skipped] [RESTRICT AUTOMERGE] Send callbacks earlier am: 7687b3cd32 am: 14df9a0d03 -s ours am: f8b3f16b18 am: 96cdac551b

Change-Id: Ic2dc8dec522f78bfa3e65194d3b7ee9ee0e1096e