am 0d313106: Merge "Use the string "OK" instead of "Set" for preferred actions" into jb-mr2-dev

* commit '0d313106079fdf44e0a9ac045a5b727461dbf3a3':
  Use the string "OK" instead of "Set" for preferred actions