Import translations. DO NOT MERGE am: 47749a01d7  -s ours
am: 27d4c36a3d  -s ours

Change-Id: Ie5b388d1266df622b41aabc29991509e2a0dc94f