Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7ca1d7b278 -s ours am: 2a5ccbbe9d -s ours am: fec78ce510 -s ours
am: dde0568e57 -s ours
am skip reason: subject contains skip directive

Change-Id: I6751067f40a0052ef318be20703b3b8a225bb635