Merge "Import translations. DO NOT MERGE" into pi-dev am: 1d557f3bb1  -s ours
am: 011c794137  -s ours

Change-Id: I212462a15a56d11ba76b5a888a052a6453bb9dbb