Strict Aliasing Fix

Change-Id: Ic6ea1de0799636b7e259ccf61504016086aadc31