Merge "Allow early abort logging" am: 18f7de841f
am: af1f4c92a4

Change-Id: I71139a1ef20b53b0cdb572cdb3feed114633c5b0