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

* commit '918baf4c4b613d7494e6451161b340b9ed3f4ad0':
  Make target-sync work with verity.