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

Change-Id: I66c5d2b441a4ecedd129b7d8c51b9351a0b9ac40