Import translations. DO NOT MERGE am: e0fec63824  -s ours
am: b22505ca14  -s ours

Change-Id: I3207da4df3a1086a3ad218054734f12b95c4fbed