Merge "Fix mac build." into rvc-dev am: 310b46c1ca

Change-Id: I133530e9ff17149241436870ca877c58ec8f3a97