Merge "Base: Add AbortFunction for logging"
am: 318cc3c03a

Change-Id: I75b4a7a17c909f81d0f835741ec60d48087af662