Reviewed-by: dholmes, gtriantafill, sla
Reviewed-by: sla, ctornqvi, lfoltan, mchung, alanb
Remove assert that prevent throwing valid exception Reviewed-by: coleenp, lfoltan