am 30707bb7: Use unique preference key.

* commit '30707bb7a27157d5124b0c648509c0e63d1da392':
  Use unique preference key.