am 1ae4f750: am 6904e0c2: am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"

* commit '1ae4f7507241d1754a4806f3151c385d909343cd':
  Add fs_mgr support for dm-verity modes