Strict Aliasing Fix

Change-Id: Ibce705acb0889807259c154b0ddf20ce4e132354