Merge "Base: Hand complete log message to aborter" am: 0d762648d0 am: e082ce827d am: 6049a29703
am: 9f5a6a6078

Change-Id: I62580bc65d2612a513c96da48f23e57d5a0f36b0