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

Change-Id: I1ea189d18471b74a7b0e188122f291372dcab568