Import translations. DO NOT MERGE am: 5453fad5c7  -s ours
am: eae76daba2  -s ours

Change-Id: Ie2fc2980d809957d5fee9fd21368d665b8150548