Merge "rename incremental service name" into rvc-dev am: df5dff04 am: 4e4eecba am: 27b07bb7 am: 00441c56 Change-Id: I9655b438a4303fc071e402d9e33e8e1bd47e307b