Fix Build Crash

Change-Id: I41c37bf66f9a51d6a17dcad6b5d8330a7c4b94df