[automerger skipped] Import translations. DO NOT MERGE am: 73a1e3f1f3  -s ours
am: ec91155bea  -s ours

Change-Id: I81953a843d4f6c0db7c1b154a653f20ee8467c84