Strict Aliasing Fix

Change-Id: I3434b663446dfab2dfa0ae2515efa007bc245278