Merge "Reset sys.shutdown.requested property" am: e6a32d5d90 am: 0a1908cdf3

Change-Id: I320c1b3817ed6e3566f15748b184a41f182ecfa8