Import translations. DO NOT MERGE am: 9aedbb0773  -s ours
am: b4d9176e36  -s ours

Change-Id: I377a324e31a8aab510f1ffd56492cdf8113064f8