workaround broken CN div height until FR #1085 is fixed

Change-Id: I312b42b6db20c52471bf4962bc27cfe96ad4d195
Merge "workaround broken CN div height until FR #1085 is fixed"