Strict Aliasing Fix

Change-Id: I325ec93e06bf03e00306a2c58db035385c931981