Merge "Allow zero stride"
am: 136a4fc875

Change-Id: I871a57c4bb12ef3c8e7b46b5480639bfa9e36f89