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

Change-Id: Ib129a13c2c2c7006ee0cdc79d52431b3f2847823