[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b2acfbeb20  -s ours
am: 23f11e4036  -s ours

Change-Id: Ic146c7391f3abf29a8086de5a389a58da40d7008