[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: ec9d9834aa -s ours
am: 1ace288546 -s ours
am skip reason: subject contains skip directive

Change-Id: I37e30e4c9acbe62bff895b80b39b4e28f4490df5