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

Change-Id: I8660a7c73b8e87c61417e6ee9c3d58c4b3f3f3a3