Czech: merge from GB

Change-Id: Ie43b2acd440559b29f9a2efa6f33bca87f667a0b