Strict Aliasing Fix

Change-Id: I4553f6f9f3694e93e9dcca943bbf5845e3572e0c