Srict Aliasing Fix

Change-Id: I0a32b618f1b7224723c5ddde478798d0156df880
STAHP

Change-Id: I0c40cbeafbb1ee3a72129f6fad4c689a1be7bc41