am 99fe0556: am f635a586: Merge "Disable verity metadata for eng builds"

* commit '99fe05567b5a76d2b3379ee91e9941272cb67219':
  Disable verity metadata for eng builds