Strict Aliasing Fix

Change-Id: I49ec0e034f8b1c80e911dc71144d2f6a2b2f84b2