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

Change-Id: Iecb3788c10b4a5dbac5ed0a741fe04a2950d1033