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

Change-Id: Iaaeb23cfa668788f8c2ca19f16f7d0882e8954fa