Merge "DO NOT MERGE Modify browser file origin policy."