Merge "Polygerrit UI" into stable-2.16