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

Change-Id: Ib290700d68dc94c9bae11e7caed6a47fdde6a464