Import translations. DO NOT MERGE
am: ef89f62670  -s ours

Change-Id: Ia2a1482ed04988a1d47940402ec868c25e8bd95f