merge in fix for skipped tests from crbug.com/397279