Infra 4002 - Update Ad 13 and Ad 18 Signed-off-by: Yi Liu <yi.liu@eclipse-foundation.org> Change-Id: I2cd90e004e0c048e2f87817ba0c51cd4a616f9f5