Merge "Init: Load fsverity keys earlier" am: f09ef56056
am: a0cc42381c

Change-Id: I3d94308e9cf428fc1306b927bfd700c87943dbc0