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

* commit '9db399ea9acc757164192c82c57c01c9e74356f6':
  Make target-sync work with verity.