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

* commit '5f2b3b4be8a769d9eea836a21e6e077cd526d3a0':