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

Change-Id: Ie15ea539bd72f49b96641493a77356ac4ebfbac9