Import translations. DO NOT MERGE
am: 6d943ad019  -s ours

Change-Id: I1b7cee1ef1711675479b249ddf18c37e7da1dedb