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

Change-Id: I2301f3720bfbde339c8cdc51b8f31cb6a83b1cf4