Merge "add diagnostic info to help debug bug:2427686"