Strict Aliasing Fix

Change-Id: I4ff315ff2d89deaf3cb7940728dfa9a6d1d5f6ba