Import translations. DO NOT MERGE
am: 730bae091c  -s ours

Change-Id: I620842646e6a4a3d460b5b8ef456dda8dbf8df2a