Merge "Import translations. DO NOT MERGE" into pi-dev am: a86ab78975  -s ours
am: 95a417e3f1  -s ours

Change-Id: If9183c15c487439ece313ab14de3e9f5a05aedaa