Import translations. DO NOT MERGE am: 08e3af1c7c  -s ours
am: e3abdd2934  -s ours

* commit 'e3abdd2934aed471e00ef724ad393569c2f689b5':

Change-Id: Iccf3c59fbfbbb78c51e7abd83f70968779957c01