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

Change-Id: I84d7bb6b0ab9b0109153da113253e49a662cb63d