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

Change-Id: Ia4d0c54598b510038fa33a223bb3b0174017e9d5