Bug fix on gerrit 58053 rebase.