Merge "fs_mgr: set partition.*.verified property even without state" am: b093cda7fb
am: 12062c04ef

* commit '12062c04ef8d835d163888e5fa22ca8c0bfff23a':
  fs_mgr: set partition.*.verified property even without state