Fix build errors

Change-Id: I908bc1e5c3d193b41adf399473d5163f3e4a3308