Reviewed-by: erikj

Reviewed-by: alanb, mchung, psandoz, rriggs

Reviewed-by: ihse

Reviewed-by: alanb, ihse