Do not include Content-Type on 204 and 304 status codes

Change-Id: Iec7e5e0a7d5f10bf264a2e8e0a01cdaf2d73fd86