[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 705292355e  -s ours
am: 3a7ab1b07e  -s ours

Change-Id: If51a9b70ab78e6c627e5af851963205866d7da99