Strict Aliasing Fix

Change-Id: Ib2e5ae49dd5b5ae50c0bc3a2253a494675acb3bc