Fix build errors

Change-Id: I851dfb72a2e55503b1e5350ec0099fdb1637c3a4