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

Change-Id: Id5d6e095531976391552b7a5906158e3d8b4ae1c