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

Change-Id: Ie2f28968faae759e1f3f554cdd94bd69998db879