Merge branch 'stable-2.12' * stable-2.12: MergeValidationListener: Adjust to the changed onPreMerge() signature Change-Id: I2297bc0f4582dbe054f28701adc1150136887d08