Merge "Import translations. DO NOT MERGE" into pi-dev
am: 28198b715b  -s ours

Change-Id: I06a8a7969cc8cc6bd141e9888b552bc922186737