followup to:
  19828cc0 "cid#1371315 Missing move assignment operator"
and
  0e748707 "cid#1371320 Missing move assignment operator"

Change-Id: Id2479fef41cf8d98eef9246f3a86e6c9289c3d58