[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b1aad16b4a -s ours am: 20cf07b649 -s ours
am: 0a6a380748 -s ours
am skip reason: subject contains skip directive

Change-Id: I9eebbf5f4377308003af01a07e0c24d50d96a2cf