[svc] Finalize first version of 2nd pass rc

Change-Id: I366850015004644c4fc7feabe27a782fdd8d8718
6 files changed