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

Change-Id: I7b653ba28b5a73c09ea6fa6271715ce336b7a38f