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

Change-Id: I154b4159e17de58be5ac55d5c703c8f5d8f41052