Remove asserts fix upgrade cases

Change-Id: Iced7abc00dcfb75cc6cac4a3a230998d8b46a0ca