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

Change-Id: I7a67bb2713ca8eba96266024423abf99e8d638d2