Import translations. DO NOT MERGE am: 3860bee3d0  -s ours am: 3024df7772  -s ours
am: 59cbce4cab  -s ours

Change-Id: Ie2a0ee5f513abd8a9fc1ed1f2b74a433fade2d83