Czech: merge from GB

Change-Id: I6486fe39d6b5942ab880ebc5e4469f4cdd424066