am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev

* commit '48ab6becea828c0bcaaf79fe930aac31881f59db':
  Make Preference-cookie map non static.