Merge commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825' * commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825': Fix bug 1930055 of NullPointerException.
Merge commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825' * commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825': Fix bug 1930055 of NullPointerException.