Merge "Add no-service configuration for GB and JP"
am: 954dcc18d7

Change-Id: Icedf5d8f6ea12c130604815ac8540c9181afa83c