[automerger skipped] DO NOT MERGE Start update_verifier early in late-fs. am: 79cfc7d5a8 -s ours
am: c0cf2d9eec

Change-Id: I2781e449da08205eabb00b415a4ce5ab67b5515e