Merge \"Reset relaunching count is app dies during re-launch\" into nyc-mr1-dev
am: 45f8aaca7c

Change-Id: I4de3c56e1745371c453f983e95d49a7c59a3c694