Strict Aliasing Fix

Change-Id: I4ff315ff2d89deaf3cb7940728dfa9a6d1d5f6ba
a

Change-Id: Ic1174492966ac1516129b79cc30e86c6b14a1a4b