[automerger skipped] Import translations. DO NOT MERGE am: 3e19c37033  -s ours
am: 0c90a8ad3a  -s ours

Change-Id: Iec960e6b8061f06c5539d4b669a25a9ac1efd1ba