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

* commit '3efa16ba35e8a16f88aa4e27663c23c0bf0e7223':
  fs_mgr: update block device reference in verity metadata

Change-Id: Ic60d31d7bbc51b6bf6c078a4071132753b3e95ce