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

Change-Id: I9b53ac21775b9611c5eb407f9619f51851b55aea