[automerger skipped] Import translations. DO NOT MERGE am: 69d02d1457 -s ours

am skip reason: subject contains skip directive

Change-Id: Ia4413bec6c8f20c6693e1ed1479ad95be688dc57