Merge "Merge "Fix boot timeout and reduce boot time" into rvc-dev am: 2d695313c9 am: 7cab6acae9 am: 03b0c47b66" into rvc-qpr-dev-plus-aosp