Merge "Merge "Fixing regression in what is considered a restart attempt" into oc-dev am: 9fb50954 am: 3c9e0d42"