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

Change-Id: Iaa50680612015a4806aa7095ca51aba9b6931178