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

Change-Id: I46bbb4746b4c1d8e379e4879733f83f227bb7963