[automerger skipped] Import translations. DO NOT MERGE
am: e63659a8e8  -s ours

Change-Id: I551e93d3560298a9ae205dfe168b77f8f94f72f3