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

Change-Id: I8dae0d85f3a6ceb6723fbb8cd6392e2844190179