Merge "fs_mgr: update block device reference in verity metadata" into nyc-mr1-dev
am: 8024f8f9ea  -s ours

* commit '8024f8f9eaec4449e98610690b639ae5935aedac':
  fs_mgr: update block device reference in verity metadata

Change-Id: I91b5ef559823a331f29491a3c98f4f1f3dd3bd9f