2.16.3: Split up changes relating to PolyGerrit

Change-Id: I8acd368714d27e61f889033d5006966a0212c503
1 file changed