am 62481cf7: am ecad7587: am 4e359e1d: Merge "fs_mgr: Use ro.boot.veritymode"

* commit '62481cf7d1b4b364dc43cc8c36bbbdc72aec04d8':
  fs_mgr: Use ro.boot.veritymode