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

Change-Id: I88584708530bc563afd004eec2449cf696104f05