Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b1aad16b4a -s ours am: 20cf07b649 -s ours am: fad0097ded -s ours
am: 8db7bde577 -s ours
am skip reason: subject contains skip directive

Change-Id: I9e06b70927ac7134c89fcc94e7acc2a13729da52