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

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