Update for spacing changes

Change-Id: I867562c3d61be6e46a179406121eaa91c6eb9232