Reviewed-by: xdono
Reviewed-by: alanb
Reviewed-by: darcy, weijun
Summary: check for NPEs Reviewed-by: chegar
