[automerger skipped] Import translations. DO NOT MERGE
am: 73915b77ed -s ours
am skip reason: subject contains skip directive

Change-Id: Ief64a890db8759f6361b58d304ff4f7e333739c6