Correctly account for negative fling directions. am: f0084673d0 am: 3f71352262
am: f1cfd96284

Change-Id: If1794de4e950d234428fb7231887650934f58eb1