Merge "Fix boot timeout and reduce boot time"