To use PolyGerrit, please enable JavaScript in your browser settings, and then refresh this page. resolved merge conflict Fixes bug 881621 (1103) ยท Gerrit Code Review