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

Change-Id: Ib16200a8058275639c047fa98c2bfc82bb00ad1b