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

Change-Id: Ibb0905e19b985f56d4bfeeb8b40061f12124d26e