[automerger skipped] Copy resume callbacks list prior to making callbacks am: a8971c1462 -s ours am: 4f68901b5b -s ours
am: 964ade1871 -s ours
am skip reason: change_id I6690ab0695bb73f11bf343fb41e9fc86b4afec1b with SHA1 940b0ac015 is in history

Change-Id: Ie74d0866695182c416c26239778da0f9c7a08c32