Strict Aliasing Fix

Change-Id: I66eec444f83c7da3c5531d58a9219cd03e1a4501