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

Change-Id: I543254e2d030e48e02d1d22f67ef01f9d7e73f1c