Fixes for time service product configurations

Change-Id: I6a0eb779e73a49e81b59ef97dc7b9e4f94b67199
16 files changed