Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 6fe655eb70 -s ours am: 5d5aae9536 -s ours
am: e859d71e0c -s ours
am skip reason: subject contains skip directive

Change-Id: I5de4a8325642562110a533fd0ce8fbaf5f69ccc2