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

Change-Id: I1def1f625eca53677f7f5a31ecf56b5a8a922ffc