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

Change-Id: I480065b64c7f8985450c1f4e2d077a0471c674d1