Automatic translation import

Change-Id: I66b4b35694d8f94c6abf47048ef595787b138a46
Automatic translation import

Change-Id: I7172a27f5a35fcb087fba97af1bfa6cd1545494e
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0