Merge "Fix verifier deps determinism" am: 42e88a0e5f
am: 98caa669f7

Change-Id: I0de4856dfd0752cab3a0544d4955bcee12f226b1