Merge "Change fs-verity setup to the new format" am: a825bc7ed3 am: ee2c469504

Change-Id: I4a69b21bfe142b8181e5f3e6704a6cc5c5d69bfd