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

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