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

Change-Id: I54fcfa04597c0792590fcdff16e63b220fdb42e0