Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 1328f9015a -s ours am: d5e671d32a -s ours am: 61ad9b3a30 -s ours
am: bc36dc92d5 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibbbe7de90d3b2d7bec237235c4c19384d978c8f3