Merge "Merge "Fix boot timeout and reduce boot time" into rvc-dev am: 2d695313 am: 7cab6aca am: 03b0c47b" into rvc-qpr-dev-plus-aosp