Re-add service components which were lost when creating 6.9.0 M3Change-Id: I26d053e7424e74aad3077811dea8cd1831b14b7c