Merge "recovery: reduce overall boot time" am: a815d3fb59
am: 9da4179ee6

Change-Id: I03c6ce2eabb113534a57ba777360eb8d16a7a47b