Import translations. DO NOT MERGE am: 3aef9aef55  -s ours
am: d9c196bc6b  -s ours

Change-Id: I296b5bab6c633b225d19c346d3b9885222a35077