Merge "Fix verifier deps determinism"
am: 42e88a0e5f

Change-Id: Ie047f0b88997f407f1d3bda66e65a0d8d6d37741