Merge "Set system property if 'updatable' process crashes too frequently"