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

Change-Id: If2a38f3a2a1080339ecd9f629a54188eab8170d5