[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 4d298cf4dc  -s ours
am: c5086a6456  -s ours

Change-Id: I53c0d32e7e3f05c775d4e0fa3aff526856de92b0