Strict Aliasing Fix

Change-Id: Ib49cfe8ba847964b80cca32eff594d9655f78ce1