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

Change-Id: I615f8756fe74228ad83a6913526b4b7978f76697