Automatic translation import

Change-Id: Idf75d92067ab5f1890596fbaf5cb69490f3fa763
Automatic translation import

Change-Id: If69f18c7e6cced66e775e4e5fd871490feac4a41
Merge branch 'upstream/cm-11.0'