Jinja change

Change-Id: Ib398b0d9d963ccd06be99b5dfe7fa9fca708f291