Fixed building issues

Change-Id: I027f41db4bd46e2350fd0e4b8e6e9239f897b256
2 files changed