Strict Aliasing Fix

Change-Id: I422f283dffb3ab63ca9e70a69cc8a0082639868a