Merge "Make Preference-cookie map non static." into lmp-dev