Merge "Base: Hand complete log message to aborter" am: 0d762648d0
am: e082ce827d

Change-Id: I0705e17a8250791fa5a8af2af9ca2c93316aee6d