This reverts commit ab5006c1. Reason for revert: b/316010034 breaking VCN unit tests Change-Id: I68cb1a99bb6e492c16901972d201761cd00df6fa