Mavericks fix

Change-Id: Ia615cd94d79504f09be451e9f3da7312c1ccbc8b
Merge topic 'patch-mavericks' into next

a6c2335 Mavericks fix
Update protobuf to bring in protobuf fixes.

Change-Id: Ic98b8866218411ecc82991dca6c53b038db10a32
Merge topic 'patch-mavericks' into next

13a214c Update protobuf to bring in protobuf fixes.