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

Change-Id: I73d825f8d67573b315f4d0081f402552f387a2b2