Merge "For pre-N apps, cascade LOCATION and DROP events." into nyc-mr1-dev