Change-Id: If09643c2e02c4c166577082cd9be9124d2e775d4
Calling guardiand a bridge dates back to v1 and no longer makes sense. Change-Id: I27d24a5d7a64c3e37d6a5ce9c402c6248ad9c59e