Fixes for build

Change-Id: I298e4a484242950c62a7b1c2c155fdcaa0edf4fe
4 files changed