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