Reviewed-by: dholmes, gtriantafill, sla
Reviewed-by: sla, ctornqvi, lfoltan, mchung, alanb
Four tests written for 8006298 Reviewed-by: mgerdin, coleenp