Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 5d25caa87a -s ours am: 823142f20a -s ours am: 8b6771a4ef -s ours
am: b0ce42e467 -s ours
am skip reason: subject contains skip directive

Change-Id: I49f83035cb72958cffc7d3c61eb3e44197d83904