Import translations. DO NOT MERGE am: 18a64f201b  -s ours
am: fceb2818d6  -s ours

Change-Id: I5bc44f819b0dcc27aa5dcd411bed23eda90ec733