Strict Aliasing Fix

Change-Id: I440ee7d55853232949a0d1424ec38fd756ad8d2d