replace some verify leftover

Change-Id: Ic0ec7d309faba1d529d90f771a6b988792d99085