Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 6fe655eb70 -s ours am: 5d5aae9536 -s ours am: c26fe29310 -s ours
am: ed079442c0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib72c0faf2d5fa4e1673a5da0f9a71d48440b3eb9