Strict Aliasing Fix

Change-Id: I73742ad32f41b5805f2c663893a5f4b2ff518141