Merge "Set system property if 'updatable' process crashes too frequently" am: 97212d36da am: 67bfa8ac57
am: 084b6e3366

Change-Id: I4dd41961784f6092fd0b1a6baa07da2791688be1