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

Change-Id: I46cbba2a73df75dbf4593f4584983b06284c0585