Reviewed-by: psandoz, chegar, mduigou, smarks

Reviewed-by: psandoz, alanb
Contributed-by: brian.goetz@oracle.com, henry.jen@oracle.com