[automerger skipped] Merge "Allow zero stride" am: 136a4fc875 am: 878963bef6
am: 3b2fb10faa -s ours
am skip reason: change_id I728b40803e80c4e534504c5b9db55921bb5e7dbc with SHA1 ffd8cb89e0 is in history

Change-Id: I189dd162f32cbc05b34b5af294e604b87d833c21