Fix bug with inconsistent space encoding/decoding in v1.

RB=315698
BUGS=SI-1571
R=kparikh,si-dev,jbetz,kjin,nshankar,gogenc
A=gogenc