Bring over the Cocoa classes for Mac

Change-Id: If7378bcfc3e6413d7a6d953181d87f5481f98cb7