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

Change-Id: Ib97acab28ba27de9f3d91c6e63b02846eea0d140