Strict Aliasing Fix

Change-Id: I9f4440e651804577fdd2b9b9a0118ad5bf487e9c