Strict Aliasing Fix

Change-Id: I5563bade41f896ffaf7541ca7e91f57a575d0150