Merge "Eliminating the black hole effect with location/drop events." into nyc-mr1-dev
am: b1dd85c081
Change-Id: I10214ed206d31e1d780216f45e600ed7216752b1
This commit is contained in:
am: b1dd85c081
Change-Id: I10214ed206d31e1d780216f45e600ed7216752b1