Fixes for build

Change-Id: Id02c5cf31f78c33e0e7b7d4e29d67d462aa8033b
2 files changed