Jinja Whitespace

Change-Id: I61b0b9c8e5d57cb4de122f22590039738ed63e2b