[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 1328f9015a -s ours am: d5e671d32a -s ours
am: ce0549992e -s ours
am skip reason: subject contains skip directive
Change-Id: I0b1c66d315e26c30f5ad352ac24fb5bf612db5cc
This commit is contained in: