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

Change-Id: Iab224a3ffd84418af295bf110e4476df10bd32e1