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

Change-Id: Ied185e552f810fb1f9e11f9fb8375382284ee37f