Fixes for build

Change-Id: I9908a459c3c691484efc6204cf6f873547f4df10
3 files changed