Merge "For pre-N apps, cascade LOCATION and DROP events." into nyc-mr1-dev am: f902fb5fa8
am: 2f6c89b3ff

Change-Id: Ia0fd0f47c72b39400d019eae5f46fbf20e3bf513