[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 51e3a842dc  -s ours
am: d0654f1daa  -s ours

Change-Id: I4fc8b717fc7477c0980858abf0afd7e02837b06f