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

Change-Id: I2d29e0bd50a1cade1644abb8f736af7210e13307