Merge "Fixed missing context while detecting unit strides."
am: 7da4b9102e

Change-Id: I5d1d41711b0d8609f41572ad088b87f7816ac1d6