Fix Build Crash

Change-Id: I5b07857c16aacf1f03811a50b1fd4b0a95c034fc