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

Change-Id: Ic1c02783731b217599d0308d98c7913bc8dfe957