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

Change-Id: I88d487b3d8c48f58461e47ddc9b96eaedef311bf