Import translations. DO NOT MERGE am: bd6f3febf9  -s ours
am: d5b82ead3f  -s ours

Change-Id: I505b3110a4b597940bb6010bcbb37a90a4da3c8f