[automerger skipped] Import translations. DO NOT MERGE am: 0b588b0ac8 -s ours am: f729a3acbc -s ours
am: 75204a8e8c -s ours
am skip reason: subject contains skip directive

Change-Id: I47abfa4ec1b227a5d864f3a71c1e73dc1cc2b846