Merge "Correctly account for negative fling directions." into nyc-mr1-dev
am: f475c56789

Change-Id: Ia6577fbac5987aa07e54192c70e19075f687486a