Merge "Fix Mac build (probably)." am: d5b0896d7a
am: 47e32a363e

Change-Id: I2f0e62d133377a9c5da50f3ca7baf6d823d69e5a