Reviewed-by: iris, sherman, chegar
Reviewed-by: alanb
Summary: Cleanup compiler warnings Reviewed-by: alanb, jccollet, michaelm
