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

Change-Id: I32c041efc02bfffcf91d690d2a362cccadeca1b1