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

Change-Id: I1b2d459e9ac0e6bca0d590ad4cd6c75edf8d131e