[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: e937b2703e -s ours
am skip reason: subject contains skip directive

Change-Id: Ic06d9c19e9213965262889d5b7f56b84751e9592