Update formatting of job related files

Change-Id: I634c26061f0ac1231647a9062b6cea01b77136bd
Merge "Update formatting of job related files"