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

Change-Id: Ied079985cf7c4277825c2111ab4c15d3a651e9f5