Merge "Perform database moveObject after actual move."
am: 8aa2c307cb

Change-Id: Ia8a7f68e0f285806dbf67c135b1e4034c1e14c89