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

Change-Id: I20a0d53f832c19dfe58d9035af4f41a2d7b3bc1c