Fixes stack protection issue. Fixes mac build issue. This reverts commit 83b1940e. Change-Id: I7ba17252882b23a740bcda2ea94aacf398255406