Fix default on service level

Change-Id: Iaad474e327cbcd248a1fb2e06e0be36219ebe9d9
4 files changed