Automatic translation import 

Change-Id: Id9c4bcb5b65d1ddfa7f92131b5787cef9b0caa93
Merge remote-tracking branch 'cm/cm-11.0' into HEAD