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

Change-Id: I2f68da926fe55d9293162b9c874fde401353e5a0