Merge "fs_mgr: update block device reference in verity metadata" am: 4cefb91611 am: 30c9aed0be
am: 348f3590f0

* commit '348f3590f0c758916f7c27d47b00d40e609baf63':
  fs_mgr: update block device reference in verity metadata

Change-Id: Ie8dcf633b193afd63803d8a0390cf203bda8857d