[automerger skipped] Import translations. DO NOT MERGE am: 195e669f80  -s ours
am: 9c1d8c1df3  -s ours

Change-Id: I739f183230a2a76d586b90f8ab73cf12d3f6bdc9