Automatic translation import

Change-Id: I0bbffc4b657390732c3c04d4ea9467984f83705e
Merge branch 'cm-11.0' into kk_mkt