infra 3866 more changes

Signed-off-by: Yi Liu <yi.liu@eclipse-foundation.org>
Change-Id: I99c208a515b4ca5b63a915915685562184b29912
1 file changed