Merge "Fix sdk-mac build." am: 49edd88601 am: 80a523b34f
am: a1151aedc2

Change-Id: I67ae355acd34f1432c0de477345d284a89c3e375