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

Change-Id: Ic12d64a47296873c3013acc8aa49a71f388b1e9b