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

Change-Id: Id546e267a6046891dbe88c125a7018f84b8761b1