Strict Aliasing Fix

Change-Id: I7f4dc714a2b38b8ba01e4a02424bff30ab53ca67