[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 57fbac14c4  -s ours
am: ede04c06f2  -s ours

Change-Id: I7eaed8747ea1cd5b1557c3ddb91e0084c3fd8295