8182601: Improve usage messages

Reviewed-by: alanb, ahgross, ksrini, mchung, dfuchs
4 files changed