Build: Fix Mac OS build am: 17b3e98558
am: 7e7f45c25d

Change-Id: Ie1c3a10fcc9d37ed4801c300613399cadc1bb5bb