Strict Aliasing Fix

Change-Id: I33dd3f2ca9830406f1f6d6cb88e106abfdf14d72