[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7eab5f3524  -s ours
am: 9ac73fc905  -s ours

Change-Id: Ica23c06f3e916d2446f05ed3783fb9391176f0ad