Prepare 6.9.0-SNAPSHOT buildsChange-Id: Ifb262290f1d5e1b1ceaa2f47f0666e472b4ca879
Re-add service components to manifestswe lost them unintentionally when creating 6.9.0 M3Change-Id: I26d053e7424e74aad3077811dea8cd1831b14b7c