Merge "Allow early abort logging"
am: 18f7de841f

Change-Id: I440edc8dcf2daa1a6eea1e9c2beb674d5d0160f7