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

Change-Id: Iea18d978463dbd861bf0697d8013f8cade2a09cf