Strict Aliasing Fix

Change-Id: I6279c244aa0ffc615d6cb23c3c539dcf685d672c