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

Change-Id: Iafd1f484aa07db9cdde2e934a8bfb3dc24e61725