Merge "Disable dm-verity hash prefetching." am: e4505960b9 am: 4cde8c3eaa

Change-Id: I9d30f108fe340772ca7bd9e5e316da5150f3a3e6