Merge "Bug 8253: Set-Field can not accept vendor extension fields."