Strict Aliasing Fix

Change-Id: I7f4efdcb9f344973f12d3e624cef96050e88527c