[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 6fe3e60d9a -s ours
am: fa3d6a0488 -s ours
am skip reason: subject contains skip directive

Change-Id: I3513e72aa6c3167f0521d961d831c370347fc807