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

Change-Id: Idf4d7ac44866c5327b45899a85d8aa22e1524eb9