Merge "Fixed missing context while detecting unit strides." am: 7da4b9102e am: f17d6e81a4 am: 5623354ed6
am: 457d7e0676

Change-Id: Ia7d6d5b6712122e0ad175f747802829219f3f390