Merge "Yet another Mac fix." am: 1e6f4d8dab
am: cb758377f9

Change-Id: I9b700ed807fffc1353a6ebfecbc9230531242492