Merge "fs_mgr: update block device reference in verity metadata" into nyc-mr1-dev