am 1d890971: Merge "sw600dp clings" into jb-dev

* commit '1d890971b4fa41b1d01f4967f5706497fa38fe58':
  sw600dp clings