am 31cc484a: am 9905c883: am 723e31ef: Merge "Allow init to set up dm-verity"

* commit '31cc484a8d86c573041342a27bea65dfa2f1cc73':
  Allow init to set up dm-verity