Sync service3 & service5 folders

Change-Id: Icf89f5847c6a596a5858411b03b0a66dfb5c767b