Merge \"Remove scheduled jobs when an app is force-stopped\" into nyc-mr1-dev
am: 5b3304387a

Change-Id: Ibddc2496e4aa33ec5c8a34cc3f99b0a722146422