Import translations. DO NOT MERGE
am: 83b18efa96  -s ours

Change-Id: I60b013d3475703caedb584f2ffe46031292ea886