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

Change-Id: Ic18ff5a653501f7537b3c4eb053103fef2c9b9a5