Fix violations with strict aliasing

Change-Id: I73a7419491868f7219da99a032db5c44a11d634d