Rename should behave like create: avoid conflict.
am: 2c89a4c170

Change-Id: I8d288a8afd06bc46d8d3051ce025c0af6c9875fa