Merge "Disabling movement of entire affiliated task set." into nyc-dev
am: 7e2d589ce0

* commit '7e2d589ce053ded6d07cc3f93297d6c32128dd3d':
  Disabling movement of entire affiliated task set.

Change-Id: Ia307ac34662cf0092f3ba00e20451b312d0cd7a8