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

Change-Id: I9e9d3007c6b5b7d7c41085be52a8d684f6e412c2