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

Change-Id: Ia903bff0e22b013664c0086dc11fdd5e3d8d8b50