Import translations. DO NOT MERGE am: d1eb44da16  -s ours
am: 0a7254c778  -s ours

Change-Id: I12f62e0006c09cdab52955fe94ca49daaaa020f1