Enable TimeService

Change-Id: I26e06301cadf6e72b45e42ce0e09d695fce24cfa

Conflicts:

	common-proprietary-files.txt