Strict Aliasing Fix

Change-Id: I1aa4e8ff5c6a8c6490c202f89894f96db47a236b