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

am skip reason: subject contains skip directive

Change-Id: If2356f8947883efaa51ba51272c49c034758d657