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

Change-Id: Ied6edc965cb4a5abf40812ac7d5ebfc2e78737f1