Strict Aliasing Fix

Change-Id: I0f3d73ce2dba9299af12397f410a3209e7994093