am 0405485c: am 5f2b3b4b: (-s ours) am 6c3b205c: am 759717ee: Merge "Update partition.*.verified even with ro.boot.veritymode set"

* commit '0405485c79037eef64efb4ab2d86c2ce71ff88e5':