[Fixed] Vendors can no longer be renamed. 0004865

Change-Id: I5725f493b6a890d51253a8d9231e15df8314cb87
Merge "[Fixed] Vendors can no longer be renamed. 0004865" into unstable