[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 589bdcd1f6  -s ours
am: 01db8c5648  -s ours

Change-Id: Ie3db845bc9cc54970650ca3a7264a14bf02064fc