Merge "Fixed missing context while detecting unit strides." am: 7da4b910 am: f17d6e81 am: 5623354e am: 457d7e06 Change-Id: Ia7d6d5b6712122e0ad175f747802829219f3f390