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

Change-Id: I8d758b491a9bbb548f69c1e31f28d13533051df7