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

* commit '93c4b6c85ac4350029e1a78c16663f61c777ac14':
  Set verity mode as the verified property value