Merge "Remove invalid assertions for 304 resp"