am 6f277ef6: (-s ours) Merge "Clean up device list - do not merge" into jb-dev

* commit '6f277ef64ecd17bf0d5e82a1698bbfb0afb3ffd2':
  Clean up device list - do not merge