Merge "Base: Add AbortFunction for logging" am: 318cc3c03a am: b7394422cb
am: 19da013df9

Change-Id: I6932d0cb68ca92695c7eca32dd032748d9e3332b