Strict Aliasing Fix

Change-Id: I32ad09d28667327a31d7ec3012850f12c113acc7