Merge "Allow zero stride" am: 136a4fc875 am: 878963bef6

Change-Id: Ia91d71e779efe51dd0ef07fa5d75cb3062ace9e7