Strict Aliasing Fix

Change-Id: Ic7bef032c5e3bcefad1ee712a830fa895c73ab2b