Import translations. DO NOT MERGE
am: 5098e36f01  -s ours

Change-Id: I9ff372f2e21d51259578ff0b82bce42e2f5d3af5