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

Change-Id: I62f4de514ef9966907dd58d56b0ea13cf1e25f66