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

Change-Id: I473d2843934d9f89417bf9cab05ee5bb3a67d368