am b6e35d1c: am 30707bb7: Use unique preference key.

* commit 'b6e35d1c5efeec22481f4912a7e422daad601fbc':
  Use unique preference key.