[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: d57d27acab  -s ours
am: 33c5997147  -s ours

Change-Id: I604148ac62fbd752d862d0c7329530fd852148c7