am 284c5cb2: Merge "Set verity mode as the verified property value"

* commit '284c5cb2a16d21e5d5123ae6a0d731dcc6beadca':
  Set verity mode as the verified property value