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

Change-Id: I0eb4cfa46009c892664fe87461cf762745ac3cac