8012146: Improve tool support

Reviewed-by: ksrini, dholmes, alanb, anthony
3 files changed