[automerger skipped] Import translations. DO NOT MERGE am: 465cd58e21 -s ours am: 95d9fb349f -s ours

am skip reason: subject contains skip directive

Change-Id: Id574128a29e9db0ddf56ab0921aa816a17855864