Merge "Eliminating the black hole effect with location/drop events." into...
Merge "Eliminating the black hole effect with location/drop events." into nyc-mr1-dev am: b1dd85c0 am: 55fc7d42
am: 380f3f1e
Change-Id: If935729f1bace7d7938ca4e7a9deababa756fb1e