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

Change-Id: I945604f8492a09b3037f9f24610725bde38e4e29