Merge "Increase fastboot timeout to 30 seconds"
am: 3b984c7efe

Change-Id: I84b1ce38fb9cf7a2536aca737ef45010887337a7