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

Change-Id: I08631c801abea7b192c592fd0338fb6661173995