Fix for build problems

Change-Id: I39d6c67c7691a91631b30b0f6519f4e44c72b846
3 files changed