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

Change-Id: I6971151c9547b8d8e1867a5732b2ab1c1bb7b9c3