Automatic translation import 

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