[automerger skipped] Rename NewTimeServiceHelper: it is no longer new am:...
[automerger skipped] Rename NewTimeServiceHelper: it is no longer new am: cf8993fa am: 365da698 -s ours
am skip reason: Change-Id I35854e853ded5be9ba129a970279e8ef122e2eb2 with SHA-1 cf8993fa is in history
Change-Id: I60a4860f1edaa7db40bae74b27d113e2b76ce120