Merge "Capture logcat early" am: 8d2843ac29
am: f78c630b61

Change-Id: I8e6fad6904057aab06f3b0ce00873d9b2f080fa0