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

Change-Id: Iff1e54ee9ef9528b9845df2d9f9b83ef4396aa6f