Czech: some fixes, merge from CM10

Change-Id: I4bac8940216d918f38ad9d32b833a2a0b25561f4
Merge branch 'cm-10.1' into CM10.1