Import translations. DO NOT MERGE am: 1e1898b6af  -s ours
am: 9ead3a66f2  -s ours

Change-Id: I54bde0ecbb2368fd431b59f1f0b351ca0b7e6962