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

Change-Id: I5dac1e824a246811caacfbb65e2011ef957eeda0