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

Change-Id: If35335dd95d837c675269cd498e822c211dd94d6