Merge "Allow special handling for move operations."
am: eaea856050

Change-Id: Ifb2de36416b9d3b3ee5805cc3f2fa11a15a8934e