Reviewed-by: alanb, tbell, ohair Contributed-by: fredrik.ohrstrom@oracle.com
Reviewed-by: darcy, weijun
