Merge "Fix boot timeout and reduce boot time" into rvc-dev