Merge "add more debug info to help (bug:3446432)"