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

Change-Id: I4d786af7951ec0eacbccb30603fe1d210a68c304