Rename should behave like create: avoid conflict. am: 2c89a4c170 am: 0e033491ca
am: 15b0cc92cf

Change-Id: I749c3c23308f25e960efeacdaf8849bfefb3cad5