Reviewed-by: weijun
Summary: throws NPE for null Builder Reviewed-by: weijun
Reviewed-by: darcy, weijun
