Merge "Make target-sync work with verity." am: db001ab8d8 am: 9db399ea9a
am: 96667e03b7

* commit '96667e03b70312d86c23001218c64d0536328fb3':