Fix given/when/then format

Change-Id: I68ca83a188d71b5dc24b3abb46585275e34cce4e
Merge "Fix given/when/then format"