[automerger skipped] Import translations. DO NOT MERGE am: 86643701e5 -s ours am: 58f487bfd2 -s ours

am skip reason: subject contains skip directive

Change-Id: I388a1e8833ba9d87508c4444a8894aefb3eeed1f