Strict Aliasing Fix

Change-Id: I110d3e9c4ff9beae252884fc5a6af9bddb9c4315