Import translations. DO NOT MERGE
am: 3bd1f3fc9f  -s ours

Change-Id: I96e27b4dca123399e7f75ebd6afe19885f57e360