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

Change-Id: Ifa2e1f1e6a4ad161737403167925f8f7721a6542