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

Change-Id: I669c53e432c7d211f87362ad37a6f0a25998fa17